@vantran-se/openchamber-web 2.1.1 → 2.2.0

package/README.md

@@ -1,4 +1,4 @@
-# <picture><source media="(prefers-color-scheme: dark)" srcset="https://github.com/openchamber/openchamber/raw/HEAD/docs/references/badges/openchamber-logo-dark.svg"><img src="https://github.com/openchamber/openchamber/raw/HEAD/docs/references/badges/openchamber-logo-light.svg" width="32" height="32" align="absmiddle" /></picture> @openchamber/web
+# <picture><source media="(prefers-color-scheme: dark)" srcset="https://github.com/vantran-se/openchamber/raw/HEAD/docs/references/badges/openchamber-logo-dark.svg"><img src="https://github.com/vantran-se/openchamber/raw/HEAD/docs/references/badges/openchamber-logo-light.svg" width="32" height="32" align="absmiddle" /></picture> @vantran-se/openchamber-web
 
 [![GitHub stars](https://img.shields.io/github/stars/openchamber/openchamber?style=flat&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iI2YxZWNlYyIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMjkuMDYsMTA4Ljc5bC00OC43LDQyLDE0Ljg4LDYyLjc5YTguNCw4LjQsMCwwLDEtMTIuNTIsOS4xN0wxMjgsMTg5LjA5LDczLjI4LDIyMi43NGE4LjQsOC40LDAsMCwxLTEyLjUyLTkuMTdsMTQuODgtNjIuNzktNDguNy00MkE4LjQ2LDguNDYsMCwwLDEsMzEuNzMsOTRMOTUuNjQsODguOGwyNC42Mi01OS42YTguMzYsOC4zNiwwLDAsMSwxNS40OCwwbDI0LjYyLDU5LjZMMjI0LjI3LDk0QTguNDYsOC40NiwwLDAsMSwyMjkuMDYsMTA4Ljc5WiIgb3BhY2l0eT0iMC4yIj48L3BhdGg%2BPHBhdGggZD0iTTIzOS4xOCw5Ny4yNkExNi4zOCwxNi4zOCwwLDAsMCwyMjQuOTIsODZsLTU5LTQuNzZMMTQzLjE0LDI2LjE1YTE2LjM2LDE2LjM2LDAsMCwwLTMwLjI3LDBMOTAuMTEsODEuMjMsMzEuMDgsODZhMTYuNDYsMTYuNDYsMCwwLDAtOS4zNywyOC44Nmw0NSwzOC44M0w1MywyMTEuNzVhMTYuMzgsMTYuMzgsMCwwLDAsMjQuNSwxNy44MkwxMjgsMTk4LjQ5bDUwLjUzLDMxLjA4QTE2LjQsMTYuNCwwLDAsMCwyMDMsMjExLjc1bC0xMy43Ni01OC4wNyw0NS0zOC44M0ExNi40MywxNi40MywwLDAsMCwyMzkuMTgsOTcuMjZabS0xNS4zNCw1LjQ3LTQ4LjcsNDJhOCw4LDAsMCwwLTIuNTYsNy45MWwxNC44OCw2Mi44YS4zNy4zNywwLDAsMS0uMTcuNDhjLS4xOC4xNC0uMjMuMTEtLjM4LDBsLTU0LjcyLTMzLjY1YTgsOCwwLDAsMC04LjM4LDBMNjkuMDksMjE1Ljk0Yy0uMTUuMDktLjE5LjEyLS4zOCwwYS4zNy4zNywwLDAsMS0uMTctLjQ4bDE0Ljg4LTYyLjhhOCw4LDAsMCwwLTIuNTYtNy45MWwtNDguNy00MmMtLjEyLS4xLS4yMy0uMTktLjEzLS41cy4xOC0uMjcuMzMtLjI5bDYzLjkyLTUuMTZBOCw4LDAsMCwwLDEwMyw5MS44NmwyNC42Mi01OS42MWMuMDgtLjE3LjExLS4yNS4zNS0uMjVzLjI3LjA4LjM1LjI1TDE1Myw5MS44NmE4LDgsMCwwLDAsNi43NSw0LjkybDYzLjkyLDUuMTZjLjE1LDAsLjI0LDAsLjMzLjI5UzIyNCwxMDIuNjMsMjIzLjg0LDEwMi43M1oiPjwvcGF0aD48L3N2Zz4%3D&logoColor=FFFCF0&labelColor=100F0F&color=66800B)](https://github.com/openchamber/openchamber/stargazers)
 [![GitHub release](https://img.shields.io/github/v/release/openchamber/openchamber?style=flat&logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iI2YxZWNlYyIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0xMjgsMTI5LjA5VjIzMmE4LDgsMCwwLDEtMy44NC0xbC04OC00OC4xOGE4LDgsMCwwLDEtNC4xNi03VjgwLjE4YTgsOCwwLDAsMSwuNy0zLjI1WiIgb3BhY2l0eT0iMC4yIj48L3BhdGg%2BPHBhdGggZD0iTTIyMy42OCw2Ni4xNSwxMzUuNjgsMThhMTUuODgsMTUuODgsMCwwLDAtMTUuMzYsMGwtODgsNDguMTdhMTYsMTYsMCwwLDAtOC4zMiwxNHY5NS42NGExNiwxNiwwLDAsMCw4LjMyLDE0bDg4LDQ4LjE3YTE1Ljg4LDE1Ljg4LDAsMCwwLDE1LjM2LDBsODgtNDguMTdhMTYsMTYsMCwwLDAsOC4zMi0xNFY4MC4xOEExNiwxNiwwLDAsMCwyMjMuNjgsNjYuMTVaTTEyOCwzMmw4MC4zNCw0NC0yOS43NywxNi4zLTgwLjM1LTQ0Wk0xMjgsMTIwLDQ3LjY2LDc2bDMzLjktMTguNTYsODAuMzQsNDRaTTQwLDkwbDgwLDQzLjc4djg1Ljc5TDQwLDE3NS44MlptMTc2LDg1Ljc4aDBsLTgwLDQzLjc5VjEzMy44MmwzMi0xNy41MVYxNTJhOCw4LDAsMCwwLDE2LDBWMTA3LjU1TDIxNiw5MHY4NS43N1oiPjwvcGF0aD48L3N2Zz4%3D&logoColor=FFFCF0&labelColor=100F0F&color=205EA6)](https://github.com/openchamber/openchamber/releases/latest)
@@ -11,23 +11,12 @@ Full project overview, screenshots, and all features: [github.com/openchamber/op
 ## Install
 
 ```bash
-curl -fsSL https://raw.githubusercontent.com/openchamber/openchamber/main/scripts/install.sh | bash
+curl -fsSL https://raw.githubusercontent.com/vantran-se/openchamber/main/scripts/install.sh | bash
 ```
 
-Or install manually: `bun add -g @openchamber/web` (or npm, pnpm, yarn).
+Or install manually: `bun add -g @vantran-se/openchamber-web` (or npm, pnpm, yarn).
 
-> **Prerequisites:** [OpenCode CLI](https://opencode.ai) installed, Node.js 22+.
-
-Start OpenCode first, then OpenChamber in another terminal:
-
-```bash
-opencode
-openchamber
-```
-
-Both clients use the same local OpenCode service, sessions, and live events. Normal local use does not require `opencode serve`, an OpenCode port, or skip-start configuration. Stopping OpenChamber Web leaves OpenCode, the TUI, and current work running.
-
-Shared Web does not install OpenChamber managed tools. Those tools remain available in Electron Desktop's managed OpenCode child.
+> **Prerequisites:** [OpenCode CLI](https://opencode.ai) installed, Node.js 24.14+.
 
 ## Usage
 
@@ -52,14 +41,20 @@ openchamber connect-url --port 3000  # Add this server to OpenChamber Desktop
 openchamber connect-url --server http://host:3000 --qr
 openchamber connect-url --port 3000 --qr
 openchamber logs                     # Follow latest instance logs
-OPENCODE_HOST=https://myhost:4096 openchamber # Connect to an external OpenCode server
-openchamber stop                     # Stop Web; OpenCode and the TUI keep running
+OPENCODE_PORT=4096 OPENCODE_SKIP_START=true openchamber                    # Connect to external OpenCode server
+OPENCODE_HOST=https://myhost:4096 OPENCODE_SKIP_START=true openchamber  # Connect via custom host/HTTPS
+openchamber stop                     # Stop server
 openchamber update                   # Update to latest version
 ```
 
 `startup enable` snapshots your current environment into the native service so startup behaves like you launched `openchamber` from the same shell. This preserves provider tokens, PATH, SSH agent settings, and other CLI auth/config env vars. Use `--no-env-snapshot` for a minimal service env.
 
-Electron Desktop keeps its managed OpenCode child and environment-backed OpenChamber tools. Ordinary Web does not install or advertise those tools. An external endpoint selected with `OPENCODE_HOST` may have user-configured tools, but OpenChamber does not install or guarantee them.
+When OpenChamber launches the local OpenCode server, it also registers a native
+`openchamber` agent tool for project, session, and scheduled-task orchestration.
+The tool is not injected when connecting to an external OpenCode server.
+Behavior settings can optionally inject a managed system-prompt optimizer on
+the next OpenCode restart. It is disabled by default and is not available for
+external OpenCode servers.
 
 ### Tunnel behavior notes
 
@@ -106,25 +101,37 @@ Generating a client token does not automatically password-protect the hosted bro
 <summary>Connect to external OpenCode server</summary>
 
 ```bash
-OPENCODE_HOST=https://myhost:4096 openchamber
+OPENCODE_PORT=4096 OPENCODE_SKIP_START=true openchamber
+OPENCODE_HOST=https://myhost:4096 OPENCODE_SKIP_START=true openchamber
 ```
 
-`OPENCODE_HOST` overrides shared local discovery. Web treats that endpoint as externally owned: it connects API and event streams but never starts, stops, or restarts the endpoint. OpenChamber managed tools are not guaranteed there.
-
 | Variable | Description |
 |----------|-------------|
-| `OPENCODE_HOST` | Full base URL of an externally owned OpenCode server |
-| `OPENCHAMBER_HOST` | Bind hostname for the OpenChamber web server (default: `127.0.0.1`; use `0.0.0.0` for LAN/remote access on trusted networks) |
+| `OPENCODE_HOST` | Full base URL of external server (overrides `OPENCODE_PORT`) |
+| `OPENCODE_PORT` | Port of external server |
+| `OPENCODE_SKIP_START` | Skip starting embedded OpenCode server |
+| `OPENCHAMBER_OPENCODE_HOSTNAME` | Bind hostname for managed OpenCode server (default: `127.0.0.1`, use `0.0.0.0` for LAN/remote access — trusted networks only). Invalid values are rejected with an error and fall back to loopback |
+| `OPENCHAMBER_HOST` | Bind hostname for the OpenChamber web server (default: `127.0.0.1`; use `0.0.0.0` for LAN/remote access — trusted networks only) |
 | `OPENCHAMBER_VERBOSE_REQUEST_LOGS` | Set to `true` to log every HTTP request; disabled by default to keep user logs small |
 | `OPENCHAMBER_GITLAB_CLIENT_ID` | OAuth application ID used for GitLab device flow. Overrides the built-in application, which covers `gitlab.com` only; a self-managed instance needs its own. Personal access token and `glab` authentication remain available without it. |
 | `OPENCHAMBER_SKIP_API_COMPRESSION` | Set to `true` to disable gzip compression for `/api/*` responses |
-| `OPENCHAMBER_COMPRESS_API` | Set to `true` to force `/api/*` compression, or `false` to disable it. Desktop disables API compression by default to reduce local sidecar CPU use |
+| `OPENCHAMBER_COMPRESS_API` | Set to `true` to force `/api/*` compression, or `false` to disable it. Desktop runtime disables API compression by default to reduce local sidecar CPU use |
 | `OPENCHAMBER_FS_UPLOAD_MAX_BYTES` | Maximum file upload size in bytes (default: 100 MiB) |
 | `OPENCHAMBER_TERMINAL_SHELL` | Preferred terminal shell executable used by the `Auto` setting before platform defaults |
 | `npm_config_registry` / `NPM_CONFIG_REGISTRY` | Registry used for plugin metadata and npm version checks. Scoped registry settings and the user's `.npmrc` are also honored. The lowercase value takes precedence when both are set. |
 
 </details>
 
+<details>
+<summary>Bind managed OpenCode to LAN / Tailscale</summary>
+
+```bash
+OPENCHAMBER_OPENCODE_HOSTNAME=0.0.0.0 openchamber --port 3000
+```
+
+**Security note:** binding to `0.0.0.0` exposes the server on all network interfaces — use only on trusted networks and protect with firewall rules or `--ui-password`.
+
+</details>
 
 **Optional env vars:**
 ```yaml
@@ -209,6 +216,7 @@ After=opencode.service
 Type=simple
 ExecStart=openchamber serve --port 3000 --host 0.0.0.0 --ui-password your-password --foreground
 Environment="OPENCODE_HOST=http://localhost:4095"
+Environment="OPENCODE_SKIP_START=true"
 Restart=on-failure
 RestartSec=5
 

package/bin/cli.js

@@ -414,9 +414,7 @@ if (isCliExecution) {
 
   main().catch((error) => {
     const message = error instanceof Error ? error.message : String(error);
-    if (error?.cliReported === true) {
-      process.exit(EXIT_CODE.GENERAL_ERROR);
-    } else if (isJsonMode(activeCommandOptions)) {
+    if (isJsonMode(activeCommandOptions)) {
       printJson({
         status: 'error',
         error: {

package/bin/cli.test.js

@@ -8,11 +8,12 @@ import { spawn } from 'child_process';
 import { pathToFileURL } from 'url';
 
 import { isModuleCliExecution, normalizeCliEntryPath } from './cli-entry.js';
+import { INJECTED_ENV_KEY, assignInjectedEnv } from '../server/lib/injected-env.js';
 import { requestJson } from './lib/cli-http.js';
 import { requestControlAction } from './lib/cli-control.js';
 import { inspectTunnelAttachability } from './lib/cli-lifecycle.js';
 import { startupCommand } from './lib/commands-startup.js';
-import { formatGoal } from './lib/commands-schedule.js';
+import { formatGoal, scheduleCommand } from './lib/commands-schedule.js';
 import {
   buildSessionCreatePayload,
   buildSessionPromptPayload,
@@ -70,10 +71,10 @@ function createMockJsonResponse(body, ok = true) {
   };
 }
 
-async function captureStream(stream, fn) {
-  const originalWrite = stream.write;
+async function captureStdout(fn) {
+  const originalWrite = process.stdout.write;
   let output = '';
-  stream.write = (chunk, encoding, callback) => {
+  process.stdout.write = (chunk, encoding, callback) => {
     output += Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk);
     if (typeof encoding === 'function') encoding();
     if (typeof callback === 'function') callback();
@@ -83,18 +84,10 @@ async function captureStream(stream, fn) {
     await fn();
     return output;
   } finally {
-    stream.write = originalWrite;
+    process.stdout.write = originalWrite;
   }
 }
 
-async function captureStdout(fn) {
-  return captureStream(process.stdout, fn);
-}
-
-async function captureStderr(fn) {
-  return captureStream(process.stderr, fn);
-}
-
 async function startMockOpenChamberServer(options = {}) {
   const runtime = options.runtime || 'web';
   const pid = Number.isFinite(options.pid) ? options.pid : null;
@@ -695,7 +688,6 @@ describe('cli API target resolution', () => {
   });
 });
 
-
 describe('network-exposed auth validation', () => {
   it('allows loopback without a UI password', () => {
     expect(() => assertAuthenticatedNetworkExposure({ host: '127.0.0.1' })).not.toThrow();
@@ -779,6 +771,22 @@ describe('serve host resolution', () => {
     }
   });
 
+  it('ignores an OPENCHAMBER_HOST that OpenChamber put into the shell', () => {
+    const previous = { OPENCHAMBER_HOST: process.env.OPENCHAMBER_HOST, [INJECTED_ENV_KEY]: process.env[INJECTED_ENV_KEY] };
+    delete process.env[INJECTED_ENV_KEY];
+    delete process.env.OPENCHAMBER_HOST;
+    assignInjectedEnv(process.env, { OPENCHAMBER_HOST: '0.0.0.0' });
+    try {
+      expect(resolveServeHost(undefined)).toBe('127.0.0.1');
+      expect(resolveServeHost('192.0.2.21')).toBe('192.0.2.21');
+    } finally {
+      for (const [key, value] of Object.entries(previous)) {
+        if (value === undefined) delete process.env[key];
+        else process.env[key] = value;
+      }
+    }
+  });
+
   it('prefers explicit --host over OPENCHAMBER_HOST', () => {
     const previous = process.env.OPENCHAMBER_HOST;
     process.env.OPENCHAMBER_HOST = '192.0.2.20';
@@ -862,6 +870,22 @@ describe('CLI HTTP helpers', () => {
     }
   });
 
+  it('reports the enabled state the server saved and fails when it did not change', async () => {
+    const originalFetch = globalThis.fetch;
+    let saved = { task: { id: 'loop:user:mine', name: 'mine', enabled: true }, enabled: true };
+    globalThis.fetch = async () => createMockJsonResponse(saved);
+    const options = { port: 45680, explicitPort: true, directory: '/repo', task: 'loop:user:mine', json: true };
+    try {
+      const output = await captureStdout(() => scheduleCommand(options, 'enable'));
+      expect(JSON.parse(output)).toMatchObject(saved);
+
+      saved = { task: { id: 'loop:user:mine', name: 'mine', enabled: false }, enabled: false };
+      await expect(scheduleCommand(options, 'enable')).rejects.toThrow('mine is still disabled.');
+    } finally {
+      globalThis.fetch = originalFetch;
+    }
+  });
+
   it.each(['oc_ui_session', 'oc_ui_session_3000'])('retries UI-authenticated API requests with the %s cookie', async (cookieName) => {
     await withTempOpenChamberDataDir(async () => {
       const port = 45678;
@@ -1030,8 +1054,8 @@ describe('cli entry detection', () => {
 
 describe('isOpenchamberCmdline', () => {
   it('accepts OpenChamber CLI and daemon cmdlines', () => {
-    expect(isOpenchamberCmdline('node /x/@openchamber/web/bin/cli.js serve')).toBe(true);
-    expect(isOpenchamberCmdline('node /x/@openchamber/web/server/index.js --port 9090')).toBe(true);
+    expect(isOpenchamberCmdline('node /x/@vantran-se/openchamber-web/bin/cli.js serve')).toBe(true);
+    expect(isOpenchamberCmdline('node /x/@vantran-se/openchamber-web/server/index.js --port 9090')).toBe(true);
     expect(isOpenchamberCmdline('bun /home/u/projects/openchamber/packages/web/server/index.js --port 3001')).toBe(true);
   });
 

package/bin/lib/DOCUMENTATION.md

@@ -15,12 +15,15 @@ Command modules implement user-facing commands and preserve output contracts acr
 
 - `commands-serve.js`
   - Implements `openchamber serve`.
-  - Owns OpenCode CLI checks, port resolution, log rotation, PID/instance registry writes, foreground/background server launch, startup summaries, and foreground shutdown behavior.
+  - Owns OpenCode CLI checks, port resolution, log rotation, PID and instance registry writes, foreground or background server launch, startup summaries, and foreground shutdown behavior.
+  - Ordinary Web connects to OpenCode's shared local service. Startup failures use the existing output adapter so JSON remains JSON-only, quiet output stays concise, and non-TTY mode never prompts.
 
 - `commands-lifecycle.js`
   - Implements `openchamber stop` and `openchamber restart`.
   - Owns lifecycle stop/restart semantics, desktop-managed port rejection, unmanaged instance shutdown attempts, PID/instance cleanup, and restart reuse of stored instance options.
 
+Stopping Web shuts down the selected OpenChamber instance but leaves a `shared-local` or `explicit-external` OpenCode service running. OpenCode process teardown belongs only to the Desktop `managed-owned` runtime.
+
 - `commands-status.js`
   - Implements `openchamber status`.
   - Formats discovered instances and tunnel readiness/status for human, quiet, and JSON output.
@@ -54,12 +57,11 @@ Command modules implement user-facing commands and preserve output contracts acr
   - Finds or starts a local instance and prints the browser/connect URL according to the selected output mode.
   - Emits a **pairing v2** link (`openchamber://connect?v=2&p=<base64url>`): it creates a one-time pairing session in the shared store (`client-pairing-sessions.json`) and encodes the pairing id + secret + transport candidates. The client redeems the secret over whichever candidate connects first (`/api/client-auth/pairing/redeem`). No standalone token is embedded — the QR itself is the single-use credential.
   - The default form advertises the resolved server URL as a direct (lan/tunnel) candidate and folds in a relay candidate when the host relay is enabled, so one link works on-LAN and off-network.
-  - `--relay` builds a relay-only pairing link (the sole candidate is the relay transport), for sharing with a device that is not on the host's network — no server URL, no auto-start. The relay endpoint follows the administrator's pin (`pinnedRelayUrl`: policy file, then `OPENCHAMBER_RELAY_URL`) / the stored setting / the default, matching the running host; the host must be running with the relay enabled to serve the redeem over the tunnel.
+  - `--relay` builds a relay-only pairing link (the sole candidate is the relay transport), for sharing with a device that is not on the host's network — no server URL, no auto-start. The relay endpoint follows `OPENCHAMBER_RELAY_URL` / the stored setting / the default, matching the running host; the host must be running with the relay enabled to serve the redeem over the tunnel.
 
 - `commands-update.js`
   - Implements `openchamber update`.
   - Loads the package-manager helper, performs update flow, and coordinates restart behavior after updates.
-  - Installs the exact version returned by the update check and verifies the globally installed version after the package manager exits; a zero exit status without the target version is a loud failure, not a success report (#3083).
 
 - `commands-tunnel.js`
   - Implements `openchamber tunnel` and its subcommands: `profile`, `providers`, `ready`, `doctor`, `status`, `start`, `stop`, and `completion`.
@@ -72,7 +74,6 @@ These modules hold reusable, non-presentational logic for commands.
 
 - `cli-args.js`
   - Argument parsing, defaults, help text, completion script generation, and typo suggestions.
-  - `COMMAND_OWNED_FLAGS` lists flags only one family of commands reads (schedule, session, tunnel, logs). Such a flag on any other command is an `Unknown option for <command>` error in every output mode instead of being ignored; global and shared flags are not listed and stay accepted everywhere. Add a new command-specific flag there.
 
 - `cli-errors.js`
   - CLI exit codes and typed tunnel CLI errors.
@@ -126,7 +127,7 @@ These modules hold reusable, non-presentational logic for commands.
 
 - `cli-startup.js`
   - Native startup service detection, install/uninstall/status helpers, and platform-specific startup command execution.
-  - The service runs the CLI by its resolved path. A pnpm global install resolves into a versioned `.pnpm` store directory that an update leaves behind, so the entrypoint is mapped back to the stable `node_modules/@openchamber/web` link when it exists.
+  - Installed startup services remain owned by their platform service manager. `startup start|stop|restart` controls that manager directly. Top-level lifecycle commands route the service's configured port through the same manager, and `update` restarts it after package installation instead of starting a duplicate daemon.
 
 - `cli-tunnel-profiles.js`
   - Tunnel profile normalization, token resolution/redaction, profile storage, migration, file-permission warnings, and managed-remote pair persistence.

package/bin/lib/cli-args.js

@@ -1,4 +1,5 @@
 import { TunnelCliError, EXIT_CODE } from './cli-errors.js';
+import { injectedEnvKeys } from '../../server/lib/injected-env.js';
 
 const DEFAULT_PORT = 3000;
 const DEFAULT_TAIL_LINES = 200;
@@ -83,7 +84,11 @@ function parseArgs(argv = process.argv.slice(2)) {
   const options = {
     port: DEFAULT_PORT,
     host: undefined,
-    uiPassword: process.env.OPENCHAMBER_UI_PASSWORD || undefined,
+    // A password OpenChamber itself put into this shell (the desktop app's, a
+    // running server's) is not a default for a new one.
+    uiPassword: injectedEnvKeys(process.env).has('OPENCHAMBER_UI_PASSWORD')
+      ? undefined
+      : process.env.OPENCHAMBER_UI_PASSWORD || undefined,
     json: false,
     all: false,
     follow: true,

package/bin/lib/cli-args.test.js

@@ -0,0 +1,34 @@
+import { afterEach, describe, expect, it } from 'vitest';
+
+import { parseArgs } from './cli-args.js';
+import { INJECTED_ENV_KEY, assignInjectedEnv } from '../../server/lib/injected-env.js';
+
+describe('parseArgs ui password default', () => {
+  const previous = {
+    OPENCHAMBER_UI_PASSWORD: process.env.OPENCHAMBER_UI_PASSWORD,
+    [INJECTED_ENV_KEY]: process.env[INJECTED_ENV_KEY],
+  };
+
+  afterEach(() => {
+    for (const [key, value] of Object.entries(previous)) {
+      if (value === undefined) delete process.env[key];
+      else process.env[key] = value;
+    }
+  });
+
+  it('takes a password the user exported', () => {
+    delete process.env[INJECTED_ENV_KEY];
+    process.env.OPENCHAMBER_UI_PASSWORD = 'theirs';
+
+    expect(parseArgs(['serve']).options.uiPassword).toBe('theirs');
+  });
+
+  it('ignores a password OpenChamber put into the shell', () => {
+    delete process.env[INJECTED_ENV_KEY];
+    delete process.env.OPENCHAMBER_UI_PASSWORD;
+    assignInjectedEnv(process.env, { OPENCHAMBER_UI_PASSWORD: 'the-desktop-apps' });
+
+    expect(parseArgs(['serve']).options.uiPassword).toBeUndefined();
+    expect(parseArgs(['serve', '--ui-password', 'chosen']).options.uiPassword).toBe('chosen');
+  });
+});

package/bin/lib/cli-lifecycle.js

@@ -234,7 +234,6 @@ async function discoverRunningInstances(options = {}) {
         mtime,
         startedAt,
         launchMode,
-        startupService: storedOptions?.startupService === true,
         runtime: liveInfo.runtime,
         source: 'registry+probe',
         host: typeof confirmedHost === 'string' && confirmedHost.length > 0

package/bin/lib/cli-network.js

@@ -7,6 +7,7 @@ import {
   isNetworkExposedBindHost,
   isUnsafeUnauthenticatedLanAllowed,
 } from '../../server/lib/security/bind-host.js';
+import { injectedEnvKeys } from '../../server/lib/injected-env.js';
 
 // Browser-unsafe ports (Fetch/Chromium restricted ports).
 const UNSAFE_BROWSER_PORTS = new Set([
@@ -24,10 +25,15 @@ function isUnsafeBrowserPort(port) {
 }
 
 function resolveConfiguredBindHost(hostOverride) {
+  // A host OpenChamber itself put into this shell (the desktop app's, a
+  // running server's) is not a default for a new one.
+  const configuredHost = injectedEnvKeys(process.env).has('OPENCHAMBER_HOST')
+    ? undefined
+    : process.env.OPENCHAMBER_HOST;
   const configured = typeof hostOverride === 'string' && hostOverride.trim()
     ? hostOverride.trim()
-    : typeof process.env.OPENCHAMBER_HOST === 'string'
-      ? process.env.OPENCHAMBER_HOST.trim()
+    : typeof configuredHost === 'string'
+      ? configuredHost.trim()
       : '';
   return configured || '127.0.0.1';
 }

package/bin/lib/cli-process.js

@@ -129,7 +129,7 @@ function isOpenchamberCmdline(cmdline) {
     return false;
   }
   // Every install path contains the "openchamber" segment — the npm package
-  // (@openchamber/web) and the source checkout both do, for the foreground
+  // (@vantran-se/openchamber-web) and the source checkout both do, for the foreground
   // (bin/cli.js) and daemon (server/index.js) entrypoints alike. Matching the
   // path segment (not a generic "cli.js") keeps a recycled stranger such as
   // "npm-cli.js" or "agentmemory" from being mistaken for us.

package/bin/lib/cli-settings-accessors.test.js

@@ -6,6 +6,8 @@ import crypto from 'crypto';
 
 import { createSettingsAccessors } from './cli-settings-accessors.js';
 import { createRelayIdentityRuntime } from '../../server/lib/relay/identity.js';
+import { createRelayKeyStore } from '../../server/lib/relay/key-store.js';
+import { deriveServerId } from '../../server/lib/relay/signing-key.js';
 
 const withTempDir = async (fn) => {
   const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'oc-settings-accessors-'));
@@ -164,26 +166,32 @@ describe('cli settings accessors', () => {
     });
   });
 
-  it('does not regenerate the relay identity off a corrupt settings file', async () => {
+  it('moves a legacy relay identity out of settings.json without changing the serverId', async () => {
     await withTempDir(async (dir) => {
       const accessors = makeAccessors(dir);
+      const relayKeyStore = createRelayKeyStore({ fsPromises: fs.promises, path, dataDir: dir, ...accessors });
+      const pair = crypto.generateKeyPairSync('ec', { namedCurve: 'P-256' });
+      const publicJwk = pair.publicKey.export({ format: 'jwk' });
       fs.writeFileSync(
         path.join(dir, 'settings.json'),
-        JSON.stringify({
-          relaySigningKey: {
-            privateJwk: crypto.generateKeyPairSync('ec', { namedCurve: 'P-256' }).privateKey.export({ format: 'jwk' }),
-            publicJwk: crypto.generateKeyPairSync('ec', { namedCurve: 'P-256' }).publicKey.export({ format: 'jwk' }),
-          },
-        }),
+        JSON.stringify({ relaySigningKey: { privateJwk: pair.privateKey.export({ format: 'jwk' }), publicJwk } }),
       );
-      const identity = await createRelayIdentityRuntime({ crypto, ...accessors }).getRelayIdentity();
-      const serverIdBefore = identity.serverId;
 
-      // Corrupt the file, then ask for the identity again: the strict gate must
-      // make this FAIL rather than mint a replacement keypair.
+      const identity = await createRelayIdentityRuntime({ crypto, relayKeyStore }).getRelayIdentity();
+
+      expect(identity.serverId).toBe(deriveServerId({ crypto }, publicJwk));
+      expect(JSON.parse(fs.readFileSync(path.join(dir, 'settings.json'), 'utf8')).relaySigningKey).toBeUndefined();
+    });
+  });
+
+  it('does not regenerate the relay identity off a corrupt settings file', async () => {
+    await withTempDir(async (dir) => {
+      const accessors = makeAccessors(dir);
+      const relayKeyStore = createRelayKeyStore({ fsPromises: fs.promises, path, dataDir: dir, ...accessors });
+      // The legacy key may sit in the unreadable file: fail rather than mint a replacement.
       fs.writeFileSync(path.join(dir, 'settings.json'), '{"relaySigningKey": {"unfinished');
-      await expect(createRelayIdentityRuntime({ crypto, ...accessors }).getRelayIdentity()).rejects.toThrow();
-      expect(serverIdBefore).toBeTruthy();
+      await expect(createRelayIdentityRuntime({ crypto, relayKeyStore }).getRelayIdentity()).rejects.toThrow();
+      expect(fs.existsSync(path.join(dir, 'relay-identity.json'))).toBe(false);
     });
   });
 });

package/bin/lib/cli-startup.js

@@ -7,6 +7,7 @@ import { EXIT_CODE, TunnelCliError } from './cli-errors.js';
 import { getDataDir } from './cli-paths.js';
 import { hasUiPasswordConfigured } from './cli-network.js';
 import { searchPathFor } from './cli-executables.js';
+import { injectedEnvKeys } from '../../server/lib/injected-env.js';
 
 const STARTUP_SERVICE_ID = 'dev.openchamber.web';
 
@@ -79,9 +80,12 @@ function getWindowsStartupWrapperPath() {
 }
 
 function collectStartupEnv(options = {}) {
+  // Variables OpenChamber itself put into this shell (the desktop app's
+  // terminal, an agent's shell) describe that instance, not the service.
+  const injected = injectedEnvKeys(process.env);
   const env = options.envSnapshot === false ? {} : Object.fromEntries(
     Object.entries(process.env)
-      .filter(([key, value]) => shouldPersistStartupEnv(key, value))
+      .filter(([key, value]) => !injected.has(key) && shouldPersistStartupEnv(key, value))
       .map(([key, value]) => [key, String(value)])
   );
 
@@ -162,7 +166,10 @@ function removeStartupEnvFile() {
 }
 
 const PNPM_STORE_SEGMENT = `${path.sep}.pnpm${path.sep}`;
-const PACKAGE_SEGMENT = `${path.sep}node_modules${path.sep}@openchamber${path.sep}web${path.sep}`;
+const PACKAGE_SEGMENTS = [
+  `${path.sep}node_modules${path.sep}@vantran-se${path.sep}openchamber-web${path.sep}`,
+  `${path.sep}node_modules${path.sep}@openchamber${path.sep}web${path.sep}`,
+];
 
 // pnpm keeps every installed version in its own store directory and links the
 // current one into node_modules. A startup service pointed at the store path
@@ -170,13 +177,15 @@ const PACKAGE_SEGMENT = `${path.sep}node_modules${path.sep}@openchamber${path.se
 function stablePnpmEntrypoint(resolved, exists = fs.existsSync) {
   const storeIndex = resolved.indexOf(PNPM_STORE_SEGMENT);
   if (storeIndex < 0) return null;
-  const packageIndex = resolved.indexOf(PACKAGE_SEGMENT, storeIndex);
-  if (packageIndex < 0) return null;
+  const packageMatch = PACKAGE_SEGMENTS
+    .map((segment) => ({ segment, index: resolved.indexOf(segment, storeIndex) }))
+    .find(({ index }) => index >= 0);
+  if (!packageMatch) return null;
   const stable = path.join(
     resolved.slice(0, storeIndex),
-    '@openchamber',
-    'web',
-    resolved.slice(packageIndex + PACKAGE_SEGMENT.length),
+    packageMatch.segment.includes('@vantran-se') ? '@vantran-se' : '@openchamber',
+    packageMatch.segment.includes('@vantran-se') ? 'openchamber-web' : 'web',
+    resolved.slice(packageMatch.index + packageMatch.segment.length),
   );
   return exists(stable) ? stable : null;
 }
@@ -253,9 +262,7 @@ function buildMacosLaunchAgent(options = {}) {
   <array>
 ${argXml}
   </array>
-${envXml}  <key>ProcessType</key>
-  <string>Background</string>
-  <key>RunAtLoad</key>
+${envXml}  <key>RunAtLoad</key>
   <true/>
   <key>KeepAlive</key>
   <true/>
@@ -508,7 +515,6 @@ export {
   stablePnpmEntrypoint,
   buildSystemdUserService,
   getStartupStatus,
-  startupServicePort,
   enableStartupService,
   disableStartupService,
   controlStartupService,

package/bin/lib/cli-startup.test.js

@@ -1,7 +1,10 @@
+import fs from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
-import { describe, expect, it } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
 
-import { buildSystemdUserService, stablePnpmEntrypoint } from './cli-startup.js';
+import { buildSystemdUserService, enableStartupService, stablePnpmEntrypoint } from './cli-startup.js';
+import { INJECTED_ENV_KEY, assignInjectedEnv } from '../../server/lib/injected-env.js';
 
 const join = (...parts) => path.join(...parts);
 
@@ -31,3 +34,90 @@ describe('buildSystemdUserService', () => {
     expect(unit).toMatch(/^SuccessExitStatus=143$/m);
   });
 });
+
+describe('macOS startup service', () => {
+  it('writes a launch agent without background process throttling', () => {
+    const home = fs.mkdtempSync(path.join(os.tmpdir(), 'openchamber-startup-'));
+    const platform = Object.getOwnPropertyDescriptor(process, 'platform');
+    const previousDataDir = process.env.OPENCHAMBER_DATA_DIR;
+    const plistPath = path.join(home, 'Library', 'LaunchAgents', 'dev.openchamber.web.plist');
+    const writeFileSync = fs.writeFileSync;
+    const stopBeforeLaunchctl = new Error('Stop before activating launchd');
+
+    try {
+      Object.defineProperty(process, 'platform', { configurable: true, value: 'darwin' });
+      process.env.OPENCHAMBER_DATA_DIR = path.join(home, '.config', 'openchamber');
+      vi.spyOn(os, 'homedir').mockReturnValue(home);
+      vi.spyOn(fs, 'writeFileSync').mockImplementation((file, ...args) => {
+        writeFileSync(file, ...args);
+        if (file === plistPath) throw stopBeforeLaunchctl;
+      });
+
+      expect(() => enableStartupService({ envSnapshot: false })).toThrow(stopBeforeLaunchctl);
+      const plist = fs.readFileSync(plistPath, 'utf8');
+      expect(plist).not.toContain('<key>ProcessType</key>');
+      expect(plist).toMatch(/<key>RunAtLoad<\/key>\s*<true\/>/);
+      expect(plist).toMatch(/<key>KeepAlive<\/key>\s*<true\/>/);
+    } finally {
+      vi.restoreAllMocks();
+      Object.defineProperty(process, 'platform', platform);
+      if (previousDataDir === undefined) delete process.env.OPENCHAMBER_DATA_DIR;
+      else process.env.OPENCHAMBER_DATA_DIR = previousDataDir;
+      fs.rmSync(home, { recursive: true, force: true });
+    }
+  });
+
+  it('leaves what OpenChamber put into the enabling shell out of the service environment', () => {
+    const home = fs.mkdtempSync(path.join(os.tmpdir(), 'openchamber-startup-'));
+    const platform = Object.getOwnPropertyDescriptor(process, 'platform');
+    const plistPath = path.join(home, 'Library', 'LaunchAgents', 'dev.openchamber.web.plist');
+    const writeFileSync = fs.writeFileSync;
+    const stopBeforeLaunchctl = new Error('Stop before activating launchd');
+    // The shell of a desktop app's terminal, or an agent's: the user's own
+    // exports next to what the app and the managed OpenCode set.
+    const ours = {
+      OPENCHAMBER_RUNTIME: 'desktop',
+      OPENCHAMBER_SKIP_API_COMPRESSION: 'true',
+      OPENCHAMBER_UI_PASSWORD: 'desktop-password',
+      OPENCODE_SERVER_PASSWORD: 'managed-password',
+    };
+    const theirs = {
+      OPENCODE_HOST: 'http://opencode.lan:4096',
+      MY_PROVIDER_TOKEN: 'token',
+      OPENCHAMBER_DATA_DIR: path.join(home, '.config', 'openchamber'),
+    };
+    const touched = [...Object.keys(ours), ...Object.keys(theirs), INJECTED_ENV_KEY];
+    const previous = Object.fromEntries(touched.map((key) => [key, process.env[key]]));
+
+    try {
+      Object.defineProperty(process, 'platform', { configurable: true, value: 'darwin' });
+      vi.spyOn(os, 'homedir').mockReturnValue(home);
+      for (const key of touched) delete process.env[key];
+      Object.assign(process.env, theirs);
+      assignInjectedEnv(process.env, ours);
+      vi.spyOn(fs, 'writeFileSync').mockImplementation((file, ...args) => {
+        writeFileSync(file, ...args);
+        if (file === plistPath) throw stopBeforeLaunchctl;
+      });
+
+      expect(() => enableStartupService({ port: 3000, host: '0.0.0.0', uiPassword: 'service-password' })).toThrow(stopBeforeLaunchctl);
+      const plist = fs.readFileSync(plistPath, 'utf8');
+      for (const key of ['OPENCHAMBER_RUNTIME', 'OPENCHAMBER_SKIP_API_COMPRESSION', 'OPENCODE_SERVER_PASSWORD', INJECTED_ENV_KEY]) {
+        expect(plist).not.toContain(`<key>${key}</key>`);
+      }
+      for (const key of Object.keys(theirs)) {
+        expect(plist).toContain(`<key>${key}</key>`);
+      }
+      expect(plist).toContain('<string>service-password</string>');
+      expect(plist).not.toContain('desktop-password');
+    } finally {
+      vi.restoreAllMocks();
+      Object.defineProperty(process, 'platform', platform);
+      for (const key of touched) {
+        if (previous[key] === undefined) delete process.env[key];
+        else process.env[key] = previous[key];
+      }
+      fs.rmSync(home, { recursive: true, force: true });
+    }
+  });
+});

package/bin/lib/commands-connect-url.js

@@ -15,6 +15,7 @@ import { getInstanceFilePath, readInstanceOptions } from './cli-process.js';
 import { createRemoteClientAuthRuntime } from '../../server/lib/client-auth/remote-clients.js';
 import { createClientPairingRuntime } from '../../server/lib/client-auth/pairing.js';
 import { createRelayIdentityRuntime } from '../../server/lib/relay/identity.js';
+import { createRelayKeyStore } from '../../server/lib/relay/key-store.js';
 import { DEFAULT_RELAY_URL, pinnedRelayUrl } from '../../server/lib/relay/service.js';
 import { bytesToBase64Url } from '../../server/lib/relay/e2ee.js';
 import { createSettingsAccessors as createSettingsAccessorsModule } from './cli-settings-accessors.js';
@@ -80,7 +81,13 @@ async function buildRelayPairingCandidate() {
   const accessors = createSettingsAccessors();
   const settings = await accessors.readSettingsFromDiskMigrated();
   const relayUrl = resolveRelayUrl(settings);
-  const identityRuntime = createRelayIdentityRuntime({ crypto, ...accessors });
+  const relayKeyStore = createRelayKeyStore({
+    fsPromises: fs.promises,
+    path,
+    dataDir: getOpenChamberDataDir(),
+    ...accessors,
+  });
+  const identityRuntime = createRelayIdentityRuntime({ crypto, relayKeyStore });
   const identity = await identityRuntime.getRelayIdentity();
   return {
     enabled: settings?.privateRelay?.enabled === true,